Feature/880 time service