Add Clear button
Add Register / Unregister lister API