Partially fix parsing for current generation instances