Adapt to MVC concept