Add SOValidation & Fix isFulfilled logic