Added TubeContainer
Move some functions from classes to container