Changes to the meta-model, adding textual contraints and other nice stuff