Fixed the constructor name.
Enhanced to generate the dispatcher initialization.