Added more components.