-Add some entities
-Improved framework