Add a hit tests and change listeners interface