Modify to be able to change context path