Tiny changes in model- DataType and DisplayFormat