Upgrade to support 3.1.1 of LL schemas