Added Completer support