Improved layering and encapsulation.