Changes to add label on all components

Changes to add label on all components