Added Notifier class and updated some methods