Document update and server refactored