Prepare code for the future
Better data mapping for document store