Refactoring the fields declaration and dispatching