I am confused how this 25TB and the 1 TB + .5 GB per subscribed user + additional storage purchased go together? Do say E3 tenants get more storage included now?