Updates to make PusherMan more universal