Fixed import requirements