Extend JSONContent from core

Change-Id: I1b211fdcb7fc7fdee66c5ce000379c2655d464af