Edited encapsulation of classes