Combine methods to fetch default schema and files from query into one

Combine methods to fetch default schema and files from query into one #59