Kind of improved  support for paths