Managing Entities

It's easier to manage entities in this release.