[Task] add components refs #13 #11