Put more intellegence to BabelDataset