additional amazon import types, better type checking