Changed to comply with new UICompleter changes