Updated for OAPoC URL changes.