Adapting for APIv1