Added components.
Modified main controller.