Adding new components; TODO update id