Added CustomTask support