Added new class Container fix logic of the class