Add Strategy & Visitor