Updated BasseListener