Support for multiple push services

Simplified settings