Added support for ResolverTargetEntityMappingListener
Using normalization and mergeTree instead of appending