add json annotation
merge json annotation