Feature/fix about scaffold