Less inheritance, more composition