Josx/unified models

https://github.com/inaes-tic/mbc-common/pull/51