Changed MaestroSupport to a class