Restores functionality, still needs adapting dependency container logic