Changed to queue notifications in separate goroutine