Fix/more thorough use of django models

Merged Florent Chehab requested to merge fix/moreThoroughUseOfDjangoModels into master

Merge request reports