#8 improve SimpleComponentContainer