Adding code to make current property optional