Update DataHandler and related part to get All data in case no data stored