- updated namespacing;
- added entities;