Update AMd definition to return the object