Adding suggestion scaffolding