Moved entity mappings collection into condition
Added support for ResolverTargetEntityMappingListener