Added more components and search stuff.