Protocol improvements + start XML export