Internal dependency injection and changed init interface