Introduce limited constructor injection