CSC encoding infrastructure upgrade