Added ToJSON class,