Keep extending the base API