Many changes and an attempt to move away from XStream due to hub
performance issues