Add types, import properly