Got rid of IoC dependency. Added T4 template