De-normalized further the Model architecture ; Port to Jongo complete