Reverted model.toJson() which created BC issues