Started moving the objects to JSON format