Fix lifetime resolution issue
Clean up visitor
WIP snapshot