Null checked for add default features