Migrate hover broker to new system