Added the support for structs