Improve server controls