Add RunBundle and sugar for complex makes