Made changes for updated Strutil and Data-structs