Rework on new model definition system.
Fixed broken files