Added unique UUIDs to templates