Do we need to change our json structures too?