maestro invocation refactoring