Fix CS, add missing attributes