Added AMD code to non-core modules