Removed duplicate site attachments code
Added site common code section