Added ability for subclasses to obscure key before storage
Cleanup