Fix app to work with the new IOC container implementation