Issue #81: Enabled storage unawareness.