Improvements in package.json and templates