Better IoC support