- Added TODO
- Added abstract Entity