Added enhanced component diagram

based on Tim Storer's feedback