Refactored the Gateway to start only with the getData from the Storage part. Also add the mehtod for getting data from the legacy storage