Added Check for working component