Moved some of the persistent data methods over to a separate method