Added type replacements
added aimport