Rebuilding the API