Updtaed to support new data types. Cleaned existing code
Updtaed to support new data types. Cleaned existing code

prashasthip/peloton,prashasthip/peloton,prashasthip/peloton,prashasthip/peloton,prashasthip/peloton,prashasthip/peloton