move storage entity to Data