Replaced the old Component design.