Data mapper moved to main class