Add of v2.1 API