Major changes, framework for representing entities