Update to use @import statements