Replace buildIncomplete with skipValidation