Version 2 update
Update Version 2 generator
Make tidy