Upgraded to revamped MVC module