Fixed PUB-SUB skeleton, pending logic