Add handler and notification