added ORM support