Refactoring of code an introduction of 'mandatory' fields