Add Listener

Signed-off-by: Levi <l.lirvat@gmail.com>