refactored db persistence factories ID-171