Added support for ObservableMap to all datasets