Expanded parser