Developer refinements and AMI support