Move from records to structs