Added username support for paths