Add some entities
Add entities. Changed creation/drop SQL scripts.
Fix bug in the Entities