Dima's component files added