Some quick updates for language and json data differentiation