GPII-270: updated config. Simplified the component.