Expanded parser definitions