Add macros and command classes