Updated to support the new mqtt string generator