Added get, and add json conversion