Completed the Server functions