Drawing replaced with Composite pattern