Fix server add and update functions :thumbsup: