Improves core modules