Enhance parser