Implement the new BaseContainer