added full support for path variables