Add ability to deep import