Code updates to skip Double type
Code updates