Overhaul pub/sub, optimized for larger projects