AMD and Module extensions changes