- Base Macro was refactored to break macro parts to helper.