move parser modifications from core to smart