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