Add better syntax, improved  metamodel