Implement for new APIs