Update for new control modules