Adding final components