Refactor to push some find quieries into finders on the model