Tweaked container for better encapsulation.