Further scaffolding for Leads