Use dependency injection where possible