Added basic support for $dataname