Adding macro management feature