Added support for path mapping