add Storage and using it in Report and NodeReport