Moved the mappers to Database so mappers can use other mappers