Add support for structures