Updated to 3.1 and PushPlugin