DEP for ORM expressions API changes

Initial work on DEP for ORM expressions API.