Standard parser improved