Adding ami tools