Small Changes to take care of data extraction