Add shape property to components