fixed mapping with database