Type unification2 - EntityManager removed

After this step we will be able to write heuristic for automatic type mapping