Updated to support ellipsis pattern without id