Simplified Controller and Model code in new components