Sync commit. Implemented addserver