Add DI to DataLayer, remove logic of TaskServer