Refactor metamodel, TCA generation (wip)