Completion files 2.0