adding maestro and hyperloop