New fields included
Final updates for v6