added more fine-grained subscription control