changed storage generation concept