Add notifications to volunteer. Some refactor