Refactored IS_DEFAULT to IS_OPTIONAL to match spec