Adding default data properties

Change-Id: I89974341a82cdb19f2a877518efe5b68efdad972