Small changes reguarding to push notification scheme