Prepare for open/save puzzle support