Move subscription processing to own function
1.2.5