Added database mappers