Types changed to cover interface changes in bg-message (add-info) and bg-header
models adjusted to changes