Improved performance removing null checks from injection points.
Code style changes, removed duplicate function getAncestorMapping
Switch back method name to avoid major version bump