Added conditional assignment (if defined)