Add status checks to model