Contributed modules to replace optional core modules