Added support for partial paths