Added experimental ORM support