Updated parse of path