minor refactoring
Adding support of Callable and Supplier as parameters or collection
values.