Add waws version
Re-order some fields