Change from using return to using notification

Add some changes to the helper constructor