Update return types