Reduced responsibilites, added factories.