More server functionality
Updated scaling