Minor refactor. Add subscription empty initialization.