Updated model utils class