Add notification for registration, quick refactoring