Tweaked version which the model is changed to work with out notes schema