added Json support