Simplify import dispatching