Added package.json
More simplified queries