Performance enhancements, Object/Key/Bucket folding for both storage schemes.