Added additional server stuff