Added more components