Issue 386 Added ORM models and custom field types