Fix Json support using class as support