added support for paths and parameters