Better logging and option to persist data