Updated subscription backend code.

I've got a slight headache but I made myself complete this task anyway.