Adding data type detection