Added control manager