Work on improving automation macros