Added field and ambiguity resolving api