Add support for nested partial paths