Adding simple AMD support