New integration with maestro