Moved tasks to DI container layout