improving invocation arguments, API uniformity and simplicity