Refactoring server arguments
Supporting long arguments for server