Fixed model creation