some improvements on model data setting