Added other attributes to component; improved paraphrase