Add support for will message and topic