[Core] Timer Changes