Move more specific code into PushHandler