Import scaffolding form current up-to-date project
Update to inlcude correct handler