More parser updates