More parse cases supported