Added boolean=? and string=? to core