Add proper support for answer notifications