Added AMF tools