Refactor - Use data in fetch rather than URl changes