Minor Changes on data handling