Restructured components to follow the dominant pattern