Fixed data component bugs, can add tasks async