completion: add support for backwards compatibility