Josx/unified models

depends on https://github.com/inaes-tic/mbc-common/pull/49