Issue 1: Move IoC initialization