Added symbol-macros