Added components sorting.