Implement the existing API