Improve server commits