WIP: Simplify integration of IoC