datadef improvements