Add more missing methods and improve cell discovery algorithm