Refactored MVC methods