Refactored macro installers