Added support for @import