Remove ORM update, add validation and proxy generation