FIX: Better structure of components list.