Integration of upcoming Ammo features