Added more entity builders; improved database initialization data; exten...

...ded check on mapping