Continuing with the Model refactoreing