Fixed model adding logic