Modified library as per new API v1.1