Changed to support MVC