Fixed custom structs generation