QUICK-FIX Add way to pass PoP URL