fixed the model return types