Changes for taskjuggler support