Key/Value lookup Storage Manager changes

Please review these changes.