Added transforming to JSON