Changing model to not return a fn