Update return types.