Updated model creation