Refactored data modelling for Razor