Updated generics for handled records