[UPDATE] Minor adjustments do data types
[UPDATE] Minor adjustments do data types