Controller changes to support persistance.