Updated document structure for server side and front-end