Using jsonfield instead of hax version