Refactoring: leaner API, parameter map used

Instead of extracting and passing each single parameter to all methods.