Now implements disambiguation of descriptions, when needed