Shapes : Consolidate Concept encoding
Shapes : fix jar model generation