Added subpath elimination