Add support for subpath