Revise parser to deal with chemical properties