Some refactoring to do with the way we inject results