Tasks refactor for bare-bones implementation