Changed subscription logic. Updated docs