Further small move towards jsonification