AMI support added