Made the struct more uniform for the response