Added Task support to enable async/await usage