Add dispatcher and stores