Added the macro class.