Added additional fields to ORM models