Components section refined