Refactored to use injection.