Feature/scaffold updates