Started implementing visitors storage