Current ad hoc persistent layer should be replaced by properly designed one.
Current ad hoc persistent layer should be replaced by properly designed one.