Addressed API change