Refactor server_default