Updates to core modules