Improved the model for user and story calls