Made all components working