Moving fetching code into separate class
Split out various extraction methods