Further progess to make the Discovery Service work