Re-work components and templates