extracted invocation handlers
more refactorings
intermediate
preparing for 1.4.1 development