Further design; more encapsulation