Adding equivalence support
Adding Crossbow equivalence
JSON fix