Refactor4 - Change model initilisation