General ORM updates
Finish updating subusers code