Update JsonStore

I made some changes to JsonStore. Please review.