@ehelms So this isn't currently handled in the model layer, but I agree it should be.  I'd rather tackle all the models together though as that is much safer and allows for proper testing.  Let me open a trello task for that.