More work done on Dataset - introducing component extraction logic.