Class structure changed. Allow to draw all components separatly.