Added json schema support