Made all components dynamic