Fixed import scoping