feature/timestampForSnapshot