Same deal as with the registry... constructor injection?