Updated the interface and added functionality for macros.