Struct improvements