Changes to lwt handling and new clientid config