Modules and Core update