Switched to a messaging factory