Updated timer and scheduler functionality