Add "elaborate" strategy for storage