Snapshot optimization

Performance optimizations when generating a snapshot, simplified the
staging model