Refactoring to take more 'raw' data from API results