Changed Scaffolt calls
Update dependencies