Fix: Model, Util, Valid