Added more to the Server option