Split logic into separate data access classes