Small update for data type convertion