break up behavioral changes into ORM and Core