Refactoring to accommodate reaction before and after the modelling is complete