Changed accessor component-expander