updated mapping for ORM