Adding Amahi 7 changes