Simplify Struct handling