Making more changes to the models helpers.