Modified Control Action Manager to segregate functionality across different classes