Enhancements to all components