First step to remove SafeGet/SafeSet methods
Removed SafeGet/SafeSet methods
Merge branch 'vbjay/master'
Fix key already exists bug.