XD-2118 Added default values for optional properties