Modules Update and some new configuration