Add initial tasks support