Changes to components and controllers