Refactoring Container as Stackable