Added blocks to visit methods