Refactoring Dispatcher and Props