New implementation of CompletionModel (attention wip!)