Updated types to use more of the generic API.