Added Basic Structure + Task DI managment