Added custom task support