Updated listeners