Fixed import or Index class