Modified some fileds for work with the new version.