PBCore 2.0 adjustment for WILL