added define, enddefine, enum