Add support for changing path