Metamodeling on fly

Restore removed elements.