Move to email subscription class that non service specific