Started working on macro support