Also added Any and Regexp blocks for duplicate check