Added model formatting