Modified to match latest Core SDK version