Added intermediate entry points for sub-paths