Wildcard-less import support
Wildcard-less import support