Add data persistance
Make sure we accept and handle Python None