Redesign data mappers to allow force loading