Update Optional for properties