Task API support added