-- added uniqueness-option, moved uniqueness to req-execution
-- added uniqueness-option