Added more decoupling around the Propeller