Changes to Configuration files and code