Convert persistence store to use Choice