Refactor of containers
TE's shouldn't be registred in a proxy!