Updating draw.component to draw.container