Additional structure changes and upgraded to version 6.2.1227