[Update] Optimize the components