updated Dapper version, refactored codebase