Adding support for paths