Added base class wrapper with key
Merge remote-tracking branch 'origin/master'