Added structs, traits and externals