Improvements to subscription handling<br />Now supports new policy stuff.