Fix issue #43: Add @Import and @ImportWithPrefix support

This doesn't need to be public