Added code to enumerate components