COOPR-523: Improve completers generation