Fixed import completion