Inject TimeService wherever needed + tweaks