Converted projects to use IoC container (!)