Added more component names