Added controller.
Refactoring.