Made properties optional