Refactored site attachment templates