Updating modules to work with 2.4.0 Core