Import of Non-MVC complete version.