Starting to extract the correct service