Orm entities redeveloping