Modified MVC, config and db files