More encapsulation work.