Updated ORM layer.