Implement to current API