Fixed dependency injections to use same dispatcher across classes