Working on snapshots
Use builders instead of injection