DataObjectEditor improvements