Object model is now loaded from a yaml file
Minnor changes