Updated Server and Editor