Implemented disambiguation front-end