Add Timer, change Logger API