Added igration for recent model changes