AMD wrapper

Added functionality to handle the use, or non use, of AMD.