Refactor subscription getter, part of #194