Added SP Directory + EventTracker