Modified some files as well as configurations