more entities and adjustments
adds entity baseclass for mapped objects