Made appropiate adjustmenst following model updates