Added components support