Refactor server::default