Remaining record and upgrade comprehensions