Change to align with the new API change