tlbBuilder: Added support for containers