Fix API version support, update api lib