Added a new API which allows per-key overriding to do additional unwrapping if needed