Use api in version 2.1