refactored to address performance problem accessing data from persistent...

... data store