Add until/count parsing