Add fail safe and inject time property