Add missing info for complaints and requests, move into structs