Refactoring into separate query usage files