More snapshot and database stuff