Some more factory methods / builder classes refactoring for the payment protocol