Made some model updates