Add FeedbackService; Refactor PushManager