Splitting 'Services to query' into different files