Removing visitor_actions dependency