Using Scoped Interfaces
Merge remote-tracking branch 'origin/json-store' into json-store
compile-error fixed