Fix to allow array/values in path