More work on notifications service