[#105] Refactored for thread safe timer