Modify return list for all model functions

Same as previous commit, but in the right directory this time.