NEXUS-5511: Optimizing imports