Data model review#

Issues#

Other topics#

Pending reorganisation.