Resolve IoC problems