HandmadeParser changes