Added control action manager