Feature/unset attributes when set to null