Adapt to changes in CBSE backend,