Fix support for Struct