Add new version with pub/sub support