Start reworking model to be used by mcapi services.