Tighten imports