adapt custom import types
fix imports