Implement extended API