Refactoring, further modelling
Refactoring, further modelling