Adding Json support so no need to parse CSV