Feature/new url subscription updated

This should be ready for merging after review.