Now handles indexed paths