Container class refactor !!