Include context in exception message
Add publisher mapping for new publishers