Fixed serverOptions to accept new classes