remaining changes to support third-party/