Added non-core modules to version 2.6