Support API change