Fixed model initialization