Add partial support for selective imports
More complete selective import support