Revised helper methods to go in model