Updated CS validation