Added dispatcher and related components