Made spark TPC compliant