Data mapper now resolves and runs SQL queries. Cleanup some entities.