Better datastore management for todo