Switch to UserQueueSuffixResolver
Add notifications and update to latest