Multiple changes

- Added the implicit manager and entity types.
- Other minor updates and fixups.