Implemented new design and supoorted composer.