Few changes to add new components (More to follow).