Refactor for improved datamapping