Switching to component based design