Class, Block, Value, Macro and Text added