Added row mappers for database queries