Added support for API V2