revised mappings according to recent changes in db.