More Updates to support MVC components