Add persistence annotations and a freezer implementation