Adding 'special' attributes to parser'
Sigle step templates
Performance adjustments