Integrate new files related to new meta-model from Dominique
relates #147