Add parsing of 'UP TO (BEFORE)' and 'STARTING FROM (AFTER)'