A bit work on component list.