Supporting more components