Implemented the new way to define model definitions