Refactored MVC for gereal info