Moved model info to model