- fixed table names and schemas
- removed Entity dependency from DataMapper