Adding ORM and Composite storage