Change the dispathcing policy to fit the new requirements