Updated both the core and 3rd party modules