Update path argument to be more flexible