@brycesch After looking at this, would it be better in model base so that we don't run into the issue again?