Change: Small model refactor