Refactoring pre-/post dispatch functionality