Added support for variables in path string