[Improvement] MVC