Enhance types for major components