Update basic scaffolding