Adding minimal executor logic