Updated to use SDK Core v2.5.*