Corrected data types and attribute properties

Corrected data types and attribute properties