Component creation improved
Component creation improved ...