Improve server-side return values