Updated to use the new API added in Patch 6.0.3.