Support Add and Check, fixes issue #3