AMD wrapper

Added functionality for use or non use of AMD.