Moved scheduling to other class