Add use_ami matcher