Improve completers generation