Added support for api 1.2.2