Updates to use timed task