Made data persistence optional.